From: Didier Raboud <odyx@debian.org>
Date: Wed, 15 May 2013 08:40:56 +0000 (+0200)
Subject: Merge branch 'master-wheezy'
X-Git-Tag: archive/raspbian/10.2018112800+rpi1^2~82
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/%22mailto:mocancezar%40gmail.com//%22mailto:i18n-csb%40linuxcsb.org/%22/%22http:/www.example.com/%22mailto:mocancezar%40gmail.com/%22mailto:i18n-csb%40linuxcsb.org/%22?a=commitdiff_plain;h=b459407133b43ce0bcb2231eff1408fe9f0b41b7;p=lsb.git

Merge branch 'master-wheezy'

Conflicts:
	debian/changelog
---

b459407133b43ce0bcb2231eff1408fe9f0b41b7